Merge from emacs-24; up to r110908
authorGlenn Morris <rgm@gnu.org>
Sun, 18 Nov 2012 01:52:36 +0000 (17:52 -0800)
committerGlenn Morris <rgm@gnu.org>
Sun, 18 Nov 2012 01:52:36 +0000 (17:52 -0800)
commitd1b7c1d36daf7f8b407ea67359c68138701c2e70
tree701cc5c315d363633708bdd31816c402a8929bb9
parent89791bc35114d55a95f0d9ee8616adb5bd4b6cb9
parent102ddb75d8c7be626088c7141fe92e87b8970064
Merge from emacs-24; up to r110908
13 files changed:
doc/emacs/ChangeLog
doc/lispref/ChangeLog
doc/lispref/windows.texi
etc/NEWS
lisp/ChangeLog
lisp/emacs-lisp/cl-lib.el
lisp/filecache.el
lisp/image.el
lisp/subr.el
lisp/vc/vc-svn.el
src/ChangeLog
src/nsterm.m
src/w32term.h